diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-07 00:33:26 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-07 00:33:26 +0000 |
| commit | dce657795aff27d3a615a145acffa739cf9e676a (patch) | |
| tree | ca6a35cb0e5fa929e87cb03ef9028d68f2cdae2c /pki/base/native-tools | |
| parent | 3b5729e16fc37dfe12fe9964e467983335d9137c (diff) | |
| download | pki-dce657795aff27d3a615a145acffa739cf9e676a.tar.gz pki-dce657795aff27d3a615a145acffa739cf9e676a.tar.xz pki-dce657795aff27d3a615a145acffa739cf9e676a.zip | |
Bugzilla Bug #643206 - New CMake based build system for Dogtag
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1607 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/native-tools')
| -rw-r--r-- | pki/base/native-tools/src/bulkissuance/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | pki/base/native-tools/src/setpin/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | pki/base/native-tools/src/tkstool/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pki/base/native-tools/src/bulkissuance/CMakeLists.txt b/pki/base/native-tools/src/bulkissuance/CMakeLists.txt index 365cd601b..31df27306 100644 --- a/pki/base/native-tools/src/bulkissuance/CMakeLists.txt +++ b/pki/base/native-tools/src/bulkissuance/CMakeLists.txt @@ -33,5 +33,5 @@ install( FILES bulkissuance.data DESTINATION - ${LIB_INSTALL_DIR}/pki/native-tools/ + ${SHARE_INSTALL_PREFIX}/pki/native-tools/ ) diff --git a/pki/base/native-tools/src/setpin/CMakeLists.txt b/pki/base/native-tools/src/setpin/CMakeLists.txt index 10ae4236e..b32e12b22 100644 --- a/pki/base/native-tools/src/setpin/CMakeLists.txt +++ b/pki/base/native-tools/src/setpin/CMakeLists.txt @@ -1,16 +1,18 @@ project(setpin C) +find_package(Ldap REQUIRED) + set(SETPIN_PRIVATE_INCLUDE_DIRS ${CMAKE_BINARY_DIR} ${NSPR_INCLUDE_DIRS} ${NSS_INCLUDE_DIRS} - ${MOZLDAP_INCLUDE_DIRS} + ${LDAP_INCLUDE_DIRS} ) set(SETPIN_LINK_LIBRARIES ${NSPR_LIBRARIES} ${NSS_LIBRARIES} - ${MOZLDAP_LIBRARIES} + ${LDAP_LIBRARIES} ) set(setpin_SRCS @@ -37,5 +39,5 @@ install( FILES setpin.conf DESTINATION - ${LIB_INSTALL_DIR}/pki/native-tools/ + ${SHARE_INSTALL_PREFIX}/pki/native-tools/ ) diff --git a/pki/base/native-tools/src/tkstool/CMakeLists.txt b/pki/base/native-tools/src/tkstool/CMakeLists.txt index 5d58d0554..8b07950eb 100644 --- a/pki/base/native-tools/src/tkstool/CMakeLists.txt +++ b/pki/base/native-tools/src/tkstool/CMakeLists.txt @@ -1,7 +1,5 @@ project(tkstool C) -find_package(MozLDAP REQUIRED) - set(TKSTOOL_PRIVATE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} |